Add a capabilities argument to the printer_get_options method and to the

2006-06-19  Matthias Clasen  <mclasen@redhat.com>

	* gtk/gtkprinter-private.h:
	* gtk/gtkprinter.c (_gtk_printer_get_options):
	* gtk/gtkprintbackend.h: Add a capabilities argument to the
	printer_get_options method and to the _gtk_printer_get_options
	function

	* modules/printbackends/lpr/gtkprintbackendlpr.c
	(lpr_printer_get_options):
	* modules/printbackends/pdf/gtkprintbackendpdf.c
	(pdf_printer_get_options):
	* modules/printbackends/cups/gtkprintbackendcups.c
	(cups_printer_get_options):
	* gtk/gtkprintunixdialog.c (selected_printer_changed): Adjust
	callers and implementations.

diff --git a/ChangeLog b/ChangeLog
index 66228eb2031678b598aa3c20a053a6e2b69c0255..1e8b2bd26982d6e9d393ab2e8dfebb77b90a2828 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,20 @@
 2006-06-19  Matthias Clasen  <mclasen@redhat.com>
 
+       * gtk/gtkprinter-private.h: 
+       * gtk/gtkprinter.c (_gtk_printer_get_options): 
+       * gtk/gtkprintbackend.h: Add a capabilities argument to the 
+       printer_get_options method and to the _gtk_printer_get_options
+       function
+       
+       * modules/printbackends/lpr/gtkprintbackendlpr.c 
+       (lpr_printer_get_options): 
+       * modules/printbackends/pdf/gtkprintbackendpdf.c 
+       (pdf_printer_get_options): 
+       * modules/printbackends/cups/gtkprintbackendcups.c 
+       (cups_printer_get_options): 
+       * gtk/gtkprintunixdialog.c (selected_printer_changed): Adjust
+       callers and implementations.
+
        * gtk/gtkprintjob.h: Add a GENERATE_PS capability. 
        * gtk/gtkprintunixdialog.c (is_printer_active): And use it here.
 

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 66228eb2031678b598aa3c20a053a6e2b69c0255..1e8b2bd26982d6e9d393ab2e8dfebb77b90a2828 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,5 +1,20 @@
 2006-06-19  Matthias Clasen  <mclasen@redhat.com>
 
+       * gtk/gtkprinter-private.h: 
+       * gtk/gtkprinter.c (_gtk_printer_get_options): 
+       * gtk/gtkprintbackend.h: Add a capabilities argument to the 
+       printer_get_options method and to the _gtk_printer_get_options
+       function
+       
+       * modules/printbackends/lpr/gtkprintbackendlpr.c 
+       (lpr_printer_get_options): 
+       * modules/printbackends/pdf/gtkprintbackendpdf.c 
+       (pdf_printer_get_options): 
+       * modules/printbackends/cups/gtkprintbackendcups.c 
+       (cups_printer_get_options): 
+       * gtk/gtkprintunixdialog.c (selected_printer_changed): Adjust
+       callers and implementations.
+
        * gtk/gtkprintjob.h: Add a GENERATE_PS capability. 
        * gtk/gtkprintunixdialog.c (is_printer_active): And use it here.
 

diff --git a/gtk/gtkprintbackend.h b/gtk/gtkprintbackend.h
index 5ccd1d7183131e1e613614c7cc84aba3eb72f798..ba08c2d546f9199a0a0ac820f5ec2a21f24fc674 100644 (file)
--- a/gtk/gtkprintbackend.h
+++ b/gtk/gtkprintbackend.h
@@ -87,7 +87,8 @@ struct _GtkPrintBackendClass
                                                              gint                 cache_fd);
   GtkPrinterOptionSet * (*printer_get_options)               (GtkPrinter          *printer,
                                                              GtkPrintSettings    *settings,
-                                                             GtkPageSetup        *page_setup);
+                                                             GtkPageSetup        *page_setup,
+                                                             GtkPrintCapabilities capabilities);
   gboolean              (*printer_mark_conflicts)            (GtkPrinter          *printer,
                                                              GtkPrinterOptionSet *options);
   void                  (*printer_get_settings_from_options) (GtkPrinter          *printer,

diff --git a/gtk/gtkprinter-private.h b/gtk/gtkprinter-private.h
index cfec13de7b9d677d3f85faf6d0fa6bd67b4b09c3..37a23a8bd22dbbe2799f890763b0f1192e289c63 100644 (file)
--- a/gtk/gtkprinter-private.h
+++ b/gtk/gtkprinter-private.h
@@ -34,8 +34,8 @@ gboolean             _gtk_printer_has_details               (GtkPrinter
 void                 _gtk_printer_request_details           (GtkPrinter          *printer);
 GtkPrinterOptionSet *_gtk_printer_get_options               (GtkPrinter          *printer,
                                                             GtkPrintSettings    *settings,
-                                                            GtkPageSetup        *page_setup);
-gboolean             _gtk_printer_mark_conflicts            (GtkPrinter          *printer,
+                                                            GtkPageSetup        *page_setup,
+                                                            GtkPrintCapabilities capabilities);gboolean             _gtk_printer_mark_conflicts            (GtkPrinter          *printer,
                                                             GtkPrinterOptionSet *options);
 void                 _gtk_printer_get_settings_from_options (GtkPrinter          *printer,
                                                             GtkPrinterOptionSet *options,

diff --git a/gtk/gtkprinter.c b/gtk/gtkprinter.c
index 1b9912e9641343f45353bb9c08b92defb058c28e..abf8a80f6407c12b6564073ffbb48a276c13e861 100644 (file)
--- a/gtk/gtkprinter.c
+++ b/gtk/gtkprinter.c
@@ -713,12 +713,13 @@ _gtk_printer_request_details (GtkPrinter *printer)
 }
 
 GtkPrinterOptionSet *
-_gtk_printer_get_options (GtkPrinter       *printer,
-                         GtkPrintSettings *settings,
-                         GtkPageSetup     *page_setup)
+_gtk_printer_get_options (GtkPrinter           *printer,
+                         GtkPrintSettings     *settings,
+                         GtkPageSetup         *page_setup,
+                         GtkPrintCapabilities  capabilities)
 {
   GtkPrintBackendClass *backend_class = GTK_PRINT_BACKEND_GET_CLASS (printer->priv->backend);
-  return backend_class->printer_get_options (printer, settings, page_setup);
+  return backend_class->printer_get_options (printer, settings, page_setup, capabilities);
 }
 
 gboolean

diff --git a/modules/printbackends/lpr/gtkprintbackendlpr.c b/modules/printbackends/lpr/gtkprintbackendlpr.c
index d0452083635eaa5137e91bedb4c42914345873ac..29a94d6901aa76983ca1e6e2cba9052a3814fdf8 100644 (file)
--- a/modules/printbackends/lpr/gtkprintbackendlpr.c
+++ b/modules/printbackends/lpr/gtkprintbackendlpr.c
@@ -67,7 +67,8 @@ static void                 lpr_printer_get_settings_from_options (GtkPrinter
                                                                   GtkPrintSettings        *settings);
 static GtkPrinterOptionSet *lpr_printer_get_options               (GtkPrinter              *printer,
                                                                   GtkPrintSettings        *settings,
-                                                                  GtkPageSetup            *page_setup);
+                                                                  GtkPageSetup            *page_setup,
+                                                                  GtkPrintCapabilities     capabilities);
 static void                 lpr_printer_prepare_for_print         (GtkPrinter              *printer,
                                                                   GtkPrintJob             *print_job,
                                                                   GtkPrintSettings        *settings,
@@ -392,9 +393,10 @@ gtk_print_backend_lpr_init (GtkPrintBackendLpr *backend)
 }
 
 static GtkPrinterOptionSet *
-lpr_printer_get_options (GtkPrinter       *printer,
-                        GtkPrintSettings *settings,
-                        GtkPageSetup     *page_setup)
+lpr_printer_get_options (GtkPrinter           *printer,
+                        GtkPrintSettings     *settings,
+                        GtkPageSetup         *page_setup,
+                        GtkPrintCapabilities  capabilities)
 {
   GtkPrinterOptionSet *set;
   GtkPrinterOption *option;

diff --git a/modules/printbackends/pdf/gtkprintbackendpdf.c b/modules/printbackends/pdf/gtkprintbackendpdf.c
index 1a362a7260095e2c67f95a96223862900c49e17b..81b9c07f75d4eed0e8980a0ab425c0a9e2b14978 100644 (file)
--- a/modules/printbackends/pdf/gtkprintbackendpdf.c
+++ b/modules/printbackends/pdf/gtkprintbackendpdf.c
@@ -39,6 +39,7 @@
 #include "gtkprintbackendpdf.h"
 
 #include "gtkprinter.h"
+#include "gtkprinter-private.h"
 
 typedef struct _GtkPrintBackendPdfClass GtkPrintBackendPdfClass;
 
@@ -69,7 +70,8 @@ static void                 pdf_printer_get_settings_from_options (GtkPrinter
                                                                   GtkPrintSettings        *settings);
 static GtkPrinterOptionSet *pdf_printer_get_options               (GtkPrinter              *printer,
                                                                   GtkPrintSettings        *settings,
-                                                                  GtkPageSetup            *page_setup);
+                                                                  GtkPageSetup            *page_setup,
+                                                                  GtkPrintCapabilities     capabilities);
 static void                 pdf_printer_prepare_for_print         (GtkPrinter              *printer,
                                                                   GtkPrintJob             *print_job,
                                                                   GtkPrintSettings        *settings,
@@ -367,9 +369,10 @@ gtk_print_backend_pdf_init (GtkPrintBackendPdf *backend)
 }
 
 static GtkPrinterOptionSet *
-pdf_printer_get_options (GtkPrinter       *printer,
-                        GtkPrintSettings *settings,
-                        GtkPageSetup     *page_setup)
+pdf_printer_get_options (GtkPrinter           *printer,
+                        GtkPrintSettings     *settings,
+                        GtkPageSetup         *page_setup,
+                        GtkPrintCapabilities  capabilities)
 {
   GtkPrinterOptionSet *set;
   GtkPrinterOption *option;